bitkeeper revision 1.1159.258.71 (4244ba1aYkdppCPVW3a0EVPx4_NxFg)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sat, 26 Mar 2005 01:25:46 +0000 (01:25 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sat, 26 Mar 2005 01:25:46 +0000 (01:25 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk-clean


Trivial merge